[IA64] Removed warning messages

Signed-off-by: Masaki Kanno <kanno.masaki@jp.fujitsu.com>

diff --git a/xen/arch/ia64/linux-xen/unaligned.c b/xen/arch/ia64/linux-xen/unaligned.c
index 800dc269526c1f0d32502e6503bcf5fcaf4a90cd..9ef5d42470fd134e9b442ca2f282f945e5c4cc25 100644 (file)
--- a/xen/arch/ia64/linux-xen/unaligned.c
+++ b/xen/arch/ia64/linux-xen/unaligned.c
@@ -377,7 +377,7 @@ get_rse_reg (struct pt_regs *regs, unsigned long r1, unsigned long *val, int*nat
     if (ridx >= sof) {
         /* read of out-of-frame register returns an undefined value; 0 in our case.  */
         DPRINT("ignoring read from r%lu; only %lu registers are allocated!\n", r1, sof);
-        panic("wrong stack register number (iip=%p)\n", regs->cr_iip);
+        panic("wrong stack register number (iip=%lx)\n", regs->cr_iip);
     }
 
     if (ridx < sor)

diff --git a/xen/arch/ia64/vmx/vmx_vcpu.c b/xen/arch/ia64/vmx/vmx_vcpu.c
index 1e61602e6001360c8d8b6a5a23841ca3b7289132..e96a166c9a56dd3fd14690ada8c4cd67852785e5 100644 (file)
--- a/xen/arch/ia64/vmx/vmx_vcpu.c
+++ b/xen/arch/ia64/vmx/vmx_vcpu.c
@@ -206,7 +206,7 @@ IA64FAULT vmx_vcpu_set_rr(VCPU *vcpu, UINT64 reg, UINT64 val)
     vcpu_get_rr(vcpu, reg, &oldrr.rrval);
     newrr.rrval=val;
     if (newrr.rid >= (1 << vcpu->domain->arch.rid_bits))
-        panic_domain (NULL, "use of invalid rid %lx\n", newrr.rid);
+        panic_domain (NULL, "use of invalid rid %x\n", newrr.rid);
     if(oldrr.ps!=newrr.ps){
         thash_purge_all(vcpu);
     }

diff --git a/xen/arch/ia64/vmx/vtlb.c b/xen/arch/ia64/vmx/vtlb.c
index 16522b1f411e2df84248a2968b57d991d5de1610..ca5fce65364dd4ec49c31590634b8d29dbbc6063 100644 (file)
--- a/xen/arch/ia64/vmx/vtlb.c
+++ b/xen/arch/ia64/vmx/vtlb.c
@@ -390,9 +390,9 @@ void vtlb_insert(thash_cb_t *hcb, u64 pte, u64 itir, u64 va)
     vcpu_get_rr(current, va, &vrr.rrval);
     if (vrr.ps != ps) {
 //        machine_tlb_insert(hcb->vcpu, entry);
-       panic_domain(NULL, "not preferred ps with va: 0x%lx vrr.ps=%d ps=%d\n",
-                    va, vrr.ps, ps);
-       return;
+        panic_domain(NULL, "not preferred ps with va: 0x%lx vrr.ps=%d ps=%ld\n",
+                     va, vrr.ps, ps);
+        return;
     }
     hash_table = vsa_thash(hcb->pta, va, vrr.rrval, &tag);
     if( INVALID_TLB(hash_table) ) {

diff --git a/xen/arch/ia64/xen/process.c b/xen/arch/ia64/xen/process.c
index 02f5c47b853a6cfcb5f2e871601081af7b359a65..8ec1da4f7600d99ef0bc702bbca7a8d4979864e7 100644 (file)
--- a/xen/arch/ia64/xen/process.c
+++ b/xen/arch/ia64/xen/process.c
@@ -195,10 +195,10 @@ void check_bad_nested_interruption(unsigned long isr, struct pt_regs *regs, unsi
        }
        vector &= ~0xf;
        if (vector != IA64_DATA_TLB_VECTOR &&
-               vector != IA64_ALT_DATA_TLB_VECTOR &&
-               vector != IA64_VHPT_TRANS_VECTOR) {
-panic_domain(regs,"psr.ic off, delivering fault=%lx,ipsr=%p,iip=%p,ifa=%p,isr=%p,PSCB.iip=%p\n",
-       vector,regs->cr_ipsr,regs->cr_iip,PSCB(v,ifa),isr,PSCB(v,iip));
+           vector != IA64_ALT_DATA_TLB_VECTOR &&
+           vector != IA64_VHPT_TRANS_VECTOR) {
+               panic_domain(regs,"psr.ic off, delivering fault=%lx,ipsr=%lx,iip=%lx,ifa=%lx,isr=%lx,PSCB.iip=%lx\n",
+                            vector,regs->cr_ipsr,regs->cr_iip,PSCB(v,ifa),isr,PSCB(v,iip));
        }
 }
 
@@ -358,7 +358,7 @@ ia64_fault (unsigned long vector, unsigned long isr, unsigned long ifa,
        struct pt_regs *regs = (struct pt_regs *) &stack;
        unsigned long code;
        char buf[128];
-       static const char * const reason[] = {
+       static const char *reason[] = {
                "IA-64 Illegal Operation fault",
                "IA-64 Privileged Operation fault",
                "IA-64 Privileged Register fault",